Merge "Add power management settings into Settings->Battery"