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

Change-Id: If028558055647e2bc6f8e8112f0045260bebd1d1