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

Change-Id: Ica37d75f7e45ad418113196b077fa4244512adc4