Merge "Tweaking layout to make two-task stacks to closer match design." into nyc-dev