Merge "Remove nested PreferenceCategory in Battery Usage page." into main