Merge "Add missing check for IsShuttingDown in profile saver"