Merge "Add nullability annotations to state save/restoration"