Merge "refactor(cm): couple el2 registers with dependent feature flags" into integration