Merge "Window magnifier state is incorrect after screen is off"