Merge "Refactor stopping the screen off brightness sensor controller" into tm-qpr-dev