Merge "Wait for remote animation to stop freezing display" into rvc-dev