Merge changes I937b7083,I2f681871

* changes:
  Move ensure activity visibility processing to helper class (72/n)
  Attempt to break down reset task codepath (71/n)