Merge "Use simple equality to compare media notif intents" into main