Merge "Enforce NO_CLEAR flag on Media Notification" into main