Merge "Change TaskIconMenu to lay out vertically" into sc-dev