Merge "Dismiss docked stack on user switch" into nyc-dev