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

Change-Id: Ic6ba7341d22d7350c380c4f07467983212d54fff