am 9bf6c5ce: Merge "Fix method for determining focused window." into klp-dev

* commit '9bf6c5cec834343104aa326b65b86c064c86c6cb':
  Fix method for determining focused window.