Merge "Send onUnlockUser() before PRE_BOOT broadcasts." into nyc-dev