Merge "AOD: Fix AOD background bug" into oc-dev