Merge "Log UserActionEvent for wifi on/off" into rvc-dev