Merge "Don't advance when recreating from bundle"