Merge "Fix incorrect magnification window size when the dvice is folded"