reorder + intrusiveBatteryLed + multiColorBatteryLed

Change-Id: I37e639ec274e8d63e0e788fb2d084499a330981a