Merge "Consider task's root activity when determining if resizable." into oc-mr1-dev