Merge "Fix Accessibility Shortcut does not show up while SystemUI restart" into tm-dev