Merge "Further improvement to determining visiblility of tasks in home stack." into nyc-dev