Merge "Handle onUnlockUser on fg thread" into oc-mr1-dev
am: 02fbb07f22

Change-Id: I2176c443aa84ebf8df92586da37e4afc630af4f8