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