Merge "Encapsulate savedState updates in ActivityRecord"