Merge "Use DockManager instead of BatteryController for Falsing." into sc-dev