Merge "Hook up media player resumption to UI" into rvc-dev