Merge "[Magnifier-40] Always child of main window" into pi-dev
am: 977871a96c

Change-Id: I4b4a74dbf13828b3c2f3df479f418c16d561d935