Merge "Use binned brightness sensor instead of prox" into qt-dev