Merge "Workaround for drawable density issues on API < 16" into nyc-dev