Merge commit '7833c22d43dc5abbbfff500b641e31897996d265' * commit '7833c22d43dc5abbbfff500b641e31897996d265': Fix volume key handling when in-call and screen is off due to proximity sensor.