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