Merge "Add test for layer updates optimizations" into jb-mr1-dev