Merge changes from topic "revert-15058002-SNQUARIDWJ" into sc-dev

* changes:
  Revert^2 "Apply overlay changes with config change"
  Revert^3 "Deprecate Context#createApplicationContext"