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

Change-Id: Ib43b237cbc9ac78c59f67038ca2bd7efa022dbcb