Merge "Reduce the number of locks acquired by display lists" into jb-mr1-dev