Merge changes Iea24e5a1,If71385bc into oc-dev

* changes:
  expand who can uninstall an instant app
  Final changes to protect the API surface