Merge "System Property Flag for Monochromatic" into tm-qpr-dev