Merge changes I7d2ca2a2,I9f1fc593 into rvc-dev

* changes:
  Fix a couple issues with previous CL (keeping tasks hidden)
  Keep task hidden until task appeared