Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev