Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev
am: 227d33439d

* commit '227d33439da72495b39508ebc7e4f3719bb5175f':
  Fix a11y crash when window layer isn't unique.

Change-Id: I943fbc2e585ea6aaa234965dacacbf88104944a1