Merge "ImageSwitcher -> ImageView in appcompat inflate"