Merge "Prevent unnecessary updateRequestedState" into rvc-dev