Merge "Scale bitmap shaders for target density" into nyc-mr1-dev