Merge "Fixes for ImageView drawable visibility dispatch" into nyc-dr1-dev
am: 7c02d7adaa

Change-Id: Iea12e62f45fb097507282d461be69d1dd83fd5a0