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