Merge commit '81c950884faa981214ce7635afe9a65eae468697' * commit '81c950884faa981214ce7635afe9a65eae468697': Fix volume keys when in-call and screen is off due to proximity sensor.