Merge "SysUI: Protect against crash in BatteryController" into nyc-mr1-dev