Bug 1089529 - Lockscreen error after screen off and on when device shows NFC shrinking UI
Merge pull request #25982 from snowmantw/bug1089529-2.1

Bug 1089529 - Lockscreen error after screen off and on when device shows...