Merge "Use menu shortcuts in ApiDemos" into pi-dev