[automerger skipped]Merge "Factor out a menu class for screen ui" am: 549695ae65 am: baf619c21c  -s ours
am: d956b6328e  -s ours

Change-Id: I13394a33a4fa977b25fea69ada7fb786509b7ae8