Merge "Remove Battery settings if battery is not present"