Merge "Wifi user action metrics" into rvc-dev