Merge "Fix profile saver reference point when calculating the sleep time" into nyc-dev