Merge "Indicator for admin control over sensor permission grants" into sc-dev