am 97054254: am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev automerge: a27e1a3

* commit '97054254d4c8eef66538814e1d5def776ceba97a':
  Be more conservative about current buffer