Merge changes 23486,23988 into eclair

* changes:
  Update the manifest to mark the activity as the default.
  enable plugins to launch an activity within the browser