Merge "Fix null pointer risk on shouldSleepActivities." into main