Merge "Shorten main settings battery string" into oc-mr1-dev