Merge "Revamp BatteryLevelChecker"