Merge \"Bring task to front when we can\'t move to adjacent stack\" into nyc-dev
am: 320c15e1b2

Change-Id: Ia0732370e4952d5cbecfb4ed86150eba090fbb49