Merge "Prevent requesting invalid state after docked" into rvc-dev