Merge "Adding a per-uid cap on concurrent alarms"