Merge "Consider task's root activity when determining if resizable." into oc-mr1-dev am: 1c2a6921c0
am: dbb33c058b

Change-Id: If3caf66edc965a46df24e2aaf4e73b83aebcbf67