Merge "Fix incorrect magnification border after rotation" into sc-dev