Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev

am: bd1708a1

* commit 'bd1708a1':
  Fixes several animation issues related to a dismissing task.
  Pipe the dismiss button logic through the touch handler.
  Skip scroll-to animation when undocking and there are no tasks.
  Fixing issue with docking being disallowed for secondary user.

Change-Id: Ib97a145fc6ff4e761a7220979913ed5be9e8fb71