Merge "Find Media Button Receiver in manifest for MediaSessionCompat" into mnc-ub-dev