Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev