* commit 'dcddea95301641e3dc9692ed7d70127085458a24': Handle keyguard visibility states separately. DO NOT MERGE