Merge "Add subtype to indicate accessibility text"