Merge "Fixes for ImageView drawable visibility dispatch" into nyc-dr1-dev