Merge "Improving proximity state logs" into main