Merge "Add extensionController based on PackageManager FEATURE" into oc-mr1-dev