Merge "Logging prox sensor entry point and screen state"