Merge "Update layers in a single batch at the beginning of a frame Bug #7186819" into jb-mr1-dev