Merge "AOD: Increase alpha values when dozing" into oc-dr1-dev