Merge "Differentiate MediaController in a process for MediaSession" into pi-dev