Merge "Restore bounds when returning from maximized window bounds" into main