Merge "Show default a11y icon in shortcut menu" into pi-dev am: 920548005b
am: 7e0c9fc818

Change-Id: I5af08aa87fcac7048a4bd641d3c74285fa97421a