automerge: 5c69f5b
* commit '5c69f5b276b65bd4b8000d2b6e56baddccf89846':
Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
automerge: 5c69f5b
* commit '5c69f5b276b65bd4b8000d2b6e56baddccf89846':
Move LOCK_TO_APP_EXIT_LOCKED from System to Secure