Merge "Implement the graphic menus" am: 06b1a89d72
am: 14177116ca

Change-Id: I12b1d7386f8dda5dba7605ee7a597c31ae4d883b