Merge \"Make sure task exists in WM before trying to set the resizing state\" into nyc-dev
am: 39647560d1

Change-Id: I077e2d9432cdcb4f4e796df158c9fdb701e2a5f6