Merge "Makes Assistant handles comply with a11y timeouts" into rvc-dev