Merge "Support accessibility shortcut secondary action (6/n)"