am 90abcc94: resolved conflicts w/0ede734d0780a968c9c345f99a18f9f8b9fc02cd

* commit '90abcc94258ba9d9c8b68ac9764b6ab1eba12985':
  Ensuring that restoreInstanceState is being called promptly for synchronously bound page