Merge "AOD: Make sure to update visibilities after instant expanding" into...
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev am: 4bb2f8e9 am: 79150c22
am: 67d518a2
Change-Id: Id889f2c7f04eef2c22fe0666566d1284d37201f3