Merge \"Merge \\\"Make sure task exists in WM before trying to set the...
Merge \"Merge \\\"Make sure task exists in WM before trying to set the resizing state\\\" into nyc-dev am: 39647560 am: a75c0709\" into nyc-mr1-dev-plus-aosp
am: e194a1eb
Change-Id: Ieb003987ac14bf1cee5bb791ce024d450aa2f74d