Merge "Separate tint and tintMode properties" into lmp-dev