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

Change-Id: I2f8598e0b907c048ac9bcded3f3d6b90a2164099