Merge "Protect the default media PiP PendingIntent" into sc-dev