Merge "Remove battery color when in power save" into lmp-dev