Merge "SF: Populate RE layer settings from layer snapshot and CE layer state"