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

* commit '141823ec6313d9545b8354ea1e3e017a1da3cfa8':
  Be more conservative about current buffer