Merge "More changes for the exact alarm permission" into sc-dev