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

Change-Id: Id9f331026d9bc76a0764685c03b0366e821cebc5