Merge "Prevent recursive calls to proximity sensor." into rvc-dev