Merge "MediaSession2: Revisit command code" into pi-dev