Merge "Reinstate USER_PRESENT for ConnectivityService"