Merge "Keep task hidden until task appeared" into rvc-dev