Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev