Merge "Ensure we update window scale when repositioning child."