am 10d273bb: Merge change 2591 into donut

Merge commit '10d273bb69016f7eb056d7ea1f3a929a5f5a3314'

* commit '10d273bb69016f7eb056d7ea1f3a929a5f5a3314':
  Check if the ownerView is still attached to window in