Merge "Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev am: 4bb2f8e9fb am: 5106255d4f" into oc-mr1-dev-plus-aosp