Merge "Don't turn on prox when wirelessly charging." into rvc-d1-dev