Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev