Merge "Fix potential NPE when saving fragment state."