am 0bdc4546: Merge "Fix for "Next" instead of Search showing up the first time" into jb-dev

* commit '0bdc4546eaf6c881c3996d653e10a25d4bb40120':
  Fix for "Next" instead of Search showing up the first time