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