Merge "[Magnifier-40] Always child of main window" into pi-dev