Merge "Minimize state changes when updating layers" into jb-mr1-dev