Merge "Removes tap continue when done text" into nyc-dev