Merge "Set bit in blit mask to settle ambiguity" into nyc-dev