am 5ba15cc3: am 9d9251c8: am 847d677f: am 3c40675f: Merge "Fix potential NPE when saving fragment state." * commit '5ba15cc3': Fix potential NPE when saving fragment state.