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

Change-Id: I8db6e55c7d045df8b9795e375754c57c1e32dfe0