Merge "Use DockManager to check whether it's docking or not"