Merge changes Icf81845d,Iea54abf3,I98656314 into sc-dev

* changes:
  Apply overlay changes with config change
  Version LoadedApk cache using base code path
  Revert "Deprecate Context#createApplicationContext"