Merge "Use VDC for API 21 and 22 to workaround the ImageView scaling issue" into nyc-dev