Merge "Refresh origins on resume"