Merge "Add NPE protection to NextAlarmController dump" into sc-qpr1-dev