Merge "Fixed bad focus stack state when focused docked stack is removed" into nyc-dev