Merge "Show default a11y icon in shortcut menu" into pi-dev