Merge "Refactor sensor use dialog to show above applications" into sc-dev