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

Change-Id: Ic132edde69bb1b2feb93f209cc4deab12f3a80f1