Fix exception on second launch and stop using plugin whitelist
Merge branch 'upstream' (crash fixes)

Conflicts:
	AppHarnessUI/android/AppHarnessUI.java