Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev