Merge "Fix AlarmManager high CPU issue" into main