Merge "part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work" into gingerbread