Merge "Fixing empty PendingAlarmInfo after alarm store changes" into sc-dev