Merge "Magnification window should not block bottom navigation bar"