Merge "More log in NotificationPlayer" into main