Merge "[SecurityController] Listen to USER_UNLOCKED"