Merge "Unhide MediaSession2 and MediaController2"