Merge "Async handling of AMS.onUnlockUser"