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

Change-Id: I6ebf2cbd3b67e94e2088badddce659a98972f1a0