Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev