Merge "Add ability to swap docked/fullscreen stack" into nyc-dev
am: 95b69f8231

* commit '95b69f82316220bc40d227bf7208920eb6ed9283':
  Add ability to swap docked/fullscreen stack