Merge "mediaplayer: smooth out videoplayback based on framerate" into lmp-dev