Merge "Use menu shortcuts in ApiDemos" into pi-dev am: 08207ad842
am: 413f32b4cf

Change-Id: I18463149d3755b1a558dd3c068afaf9fc6f536cf