Merge "Handle keyguard visibility states separately. DO NOT MERGE" into jb-dev