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

Change-Id: I7bc8b27c8c964c280ec78f3e0d2564a62fc39bf9