Merge "Do not extend timeout if not playing" into rvc-dev