Merge "Avoid long sleep in ProfileSaver"