Merge "Handle keyguard visibility states separately."