Backport "Merge PR #6584: FIX(client): Specify version when loading/saving MainWindow state" to 1.5.x

Backport "Merge PR #6584: FIX(client): Specify version when loading/saving MainWindow state" to 1.5.x #6497