am bc1a8f42: Merge "Active window not correctly computed."

* commit 'bc1a8f42d9eb5f1d91c872904a9a283781291fcb':
  Active window not correctly computed.