Merge commit '8f476407bf4e6283b128532d594d44cc527e8204' * commit '8f476407bf4e6283b128532d594d44cc527e8204': part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
Merge commit '8f476407bf4e6283b128532d594d44cc527e8204' * commit '8f476407bf4e6283b128532d594d44cc527e8204': part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work