Merge changes from topic "bk/context_refactor" into integration

* changes:
  fix(gicv3): restore scr_el3 after changing it
  refactor(cm): make SVE and SME build dependencies logical