Merge "Apply tint when setting check mark drawable" into nyc-dev