Merge "Allow one of description or htmlDescription attribute provided for AccessibilityShortcutInfo" into rvc-dev