Merge "Fix wrong transition when dock minimized and docked app launched" into nyc-dev