Merge "Fix profile saver initial wait" into nyc-dev