Merge "Settings enable a11y shortcut framework features"