Merge "MediaPlayer2: uid is always valid."