Merge "ConnectivityService: listen to USER_UNLOCKED too" into nyc-dev