Merge "Fix profile saver initial wait"