Merge "Fix NotificationPlayer wakelock being held for too long." into main