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

Change-Id: I71d3484758849dab7b14632edadccfb14137d3aa