Merge "Don't register the binned brightness sensor for disabled displays" into tm-qpr-dev