Merge "Have the top activity follow Task resizability" into sc-v2-dev