Merge "Fixing bugs in MediaPlayer docs" into klp-docs