Merge "Split flicker configuration" into udc-qpr-dev