Merge "Screen saver string fixes" into nyc-dev