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