Merge "Preemptively add string for possible toast." into nyc-mr1-dev