Merge "Only load the prox sensor for the default display"