Bug 934906 - [Flatfish] Dock disappears
Merge pull request #13434 from cctuan/934906

Bug 934906 - [Flatfish] Dock disappears