Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev am: bd1708a1 am: 221240d7

am: 9814d5e6

* commit '9814d5e6':
  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: I84d308bbf3d8cb4656539eaa65b1c7af99fcbed0