Merge "MediaSessionManager: Apply API council review" into pi-dev