Merge "Fix legacy a11y service fail to update a11y button flag"