Merge "Use cached keyguard flags during relaunch." into oc-dev