Merge "Update subtitle for apps in battery settings" into oc-dev