Merge "AOD: Fix in-place ambient layout updates"