Merge "Be more conservative about current buffer" into lmp-mr1-dev