Merge "Fixed contrast with sfps overlay." into tm-qpr-dev