am af6288b7: am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev

* commit 'af6288b721110ffc4b4e68d55398b5ca31fc32e8':
  DO NOT MERGE Ensure transient state views are temporarily detached