Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev