Merge "Perform bounds snap when not changing windowing mode." into main