am c3961a2c: am 0d7558fc: Merge "Magnified frame not properly computed when...
am c3961a2c: am 0d7558fc: Merge "Magnified frame not properly computed when keyguard goes away." into jb-mr1-dev
* commit 'c3961a2c':
Magnified frame not properly computed when keyguard goes away.