Merge "Fix issue #5642121: Proximity sensor didn't turn the screen on in call" into ics-mr1