Merge "Don't cancel PendingIntents unless the stay_stopped flag is on." into main