Merge "Unhide MediaPlayer#MEDIA_INFO_STARTED_AS_NEXT" into pi-dev