Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev