Merge "Handle onUnlockUser on fg thread" into oc-mr1-dev