Merge "Fix race condition in rememberPageStateFixed" into udc-dev