Merge "Turn on battery settings feature by default"