Merge "MediaSession2: Update Builder" into pi-dev