Merge "Finish SensorUse activity when dialog is dismissed" into sc-dev