Merge "Reuse a given MediaSessionCompat instead of creating another one" into nyc-support-25.1-dev