Merge "Deprecate Activity.onStateNotSaved"