Merge "Don't show sensor use dialog for system uid" into sc-dev