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

Change-Id: Ifc53c7b55dc1c54268ddd9ebcd72972d0e37dee8