Merge "Fix ColorInversionTile for secondary users" into lmp-dev