Merge "Moving autobrightness display configs to a different file" into tm-qpr-dev