am 2b5c5b64: am 0bb4d078: Merge "Screen magnifier should handle window...
am 2b5c5b64: am 0bb4d078: Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev
* commit '2b5c5b64':
Screen magnifier should handle window rebuilds correctly.