Merge "MediaController: Fix annotation of Callback#onPlaybackStateChanged()" into pi-dev