am 64ab8fcd: (-s ours) am dcddea95: Merge "Handle keyguard visibility states...
am 64ab8fcd: (-s ours) am dcddea95: Merge "Handle keyguard visibility states separately. DO NOT MERGE" into jb-dev
* commit '64ab8fcd':
Handle keyguard visibility states separately. DO NOT MERGE