Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev