Merge "Fixes NullPointerException for DockManager."