Merge "Allow sensors to be specified per display" into sc-dev