Merge "Fix issues with docked stack not un-minimizing" into nyc-dev
am: b72b265c85

* commit 'b72b265c85b2315c306de78d00365087c24375ce':
  Fix issues with docked stack not un-minimizing

Change-Id: I4db615b1a38f0c330e62bc42bfe54b46f0b0cebc