Merge "Fixing issue where the configuration can have stale docked state."