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

Change-Id: I4a438ad694fd33c0d2165aecdb7d4d220a2cd42f