Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev