am 7c6cbc2c: DO NOT MERGE fix focus bug

* commit '7c6cbc2c917bd8c1dacaf44585fbaeb7f722e16a':
  DO NOT MERGE fix focus bug