Merge "AOD: Ensure dark amount is set after reinflating" into oc-dr1-dev