Merge "Add ability to swap docked/fullscreen stack" into nyc-dev