Merge changes I63f2b185,I0d749c1a into pi-dev

* changes:
  [Magnifier-42] Fix bug in window positioning
  [Magnifier-41] Fix behavior in windows with insets