Merge "Persist the nit brightness for the default display" into tm-qpr-dev