Merge "Prevent scaled window from leaving screen bounds for back to home" into main