am 50d84e11: (-s ours) am 7c6cbc2c: DO NOT MERGE fix focus bug

* commit '50d84e11c0be0c40e411eeba1d2d52b9b13fa0fa':
  DO NOT MERGE fix focus bug