Merge "Add a flag for docking indicator" into main