Merge "Layer flags won't change between prepare and set" into jb-mr1-dev