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

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