Merge "Allow separate configuration of display color fade" into udc-qpr-dev