Merge "Adjust buffer position after copying" into jb-mr1-dev