Merge "Fix width of GA popup menu." into rvc-dev