Merge "Fix keyguard visibilities after reinflate" into oc-dr1-dev