Merge "Update method isSmartBatteryEnabled()" into pi-dev