Merge "Hide color filter mutability" into lmp-dev