Merge "Support rich content for accessibility shortcut target"