Merge "Slightly more realistic shade transitions" into udc-qpr-dev