Merge "Adding support for generating manachrome icon from a colored icon" into tm-qpr-dev