Merge "Update layers to clear them Bug #8489505" into jb-mr2-dev