Merge "Fix crash when rotating the device on magnification mode dialog"