diff --git a/interface/src/raypick/PickScriptingInterface.cpp b/interface/src/raypick/PickScriptingInterface.cpp
index ce01db3a56..cf7680bb6c 100644
--- a/interface/src/raypick/PickScriptingInterface.cpp
+++ b/interface/src/raypick/PickScriptingInterface.cpp
@@ -71,6 +71,18 @@ PickFilter getPickFilter(unsigned int filter) {
 unsigned int PickScriptingInterface::createRayPick(const QVariant& properties) {
     QVariantMap propMap = properties.toMap();
 
+
+#if defined (Q_OS_ANDROID)
+    QString jointName { "" };
+    if (propMap["joint"].isValid()) {
+        QString jointName = propMap["joint"].toString();
+        QString mouseJoint { "Mouse" };
+        if (jointName == mouseJoint) {
+            return PointerEvent::INVALID_POINTER_ID;
+        }
+    }
+#endif
+
     bool enabled = false;
     if (propMap["enabled"].isValid()) {
         enabled = propMap["enabled"].toBool();
diff --git a/interface/src/raypick/PointerScriptingInterface.cpp b/interface/src/raypick/PointerScriptingInterface.cpp
index 19c20f0c06..10761e0696 100644
--- a/interface/src/raypick/PointerScriptingInterface.cpp
+++ b/interface/src/raypick/PointerScriptingInterface.cpp
@@ -150,6 +150,17 @@ unsigned int PointerScriptingInterface::createStylus(const QVariant& properties)
 unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& properties) const {
     QVariantMap propertyMap = properties.toMap();
 
+#if defined (Q_OS_ANDROID)
+    QString jointName { "" };
+    if (propertyMap["joint"].isValid()) {
+        QString jointName = propertyMap["joint"].toString();
+        QString mouseJoint { "Mouse" };
+        if (jointName == mouseJoint) {
+            return PointerEvent::INVALID_POINTER_ID;
+        }
+    }
+#endif
+
     bool faceAvatar = false;
     if (propertyMap["faceAvatar"].isValid()) {
         faceAvatar = propertyMap["faceAvatar"].toBool();
diff --git a/libraries/pointers/src/PickCacheOptimizer.h b/libraries/pointers/src/PickCacheOptimizer.h
index 0bbdfea8e4..6aa343480b 100644
--- a/libraries/pointers/src/PickCacheOptimizer.h
+++ b/libraries/pointers/src/PickCacheOptimizer.h
@@ -11,6 +11,8 @@
 #include <unordered_map>
 
 #include "Pick.h"
+#include "PerfStat.h"
+#include "Profile.h"
 
 typedef struct PickCacheKey {
     PickFilter::Flags mask;
diff --git a/libraries/pointers/src/PickManager.cpp b/libraries/pointers/src/PickManager.cpp
index d3326ea8b4..0cf5f90e3d 100644
--- a/libraries/pointers/src/PickManager.cpp
+++ b/libraries/pointers/src/PickManager.cpp
@@ -6,6 +6,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 #include "PickManager.h"
+#include "PerfStat.h"
+#include "Profile.h"
 
 PickManager::PickManager() {
     setShouldPickHUDOperator([]() { return false; });
@@ -119,10 +121,26 @@ void PickManager::update() {
     bool shouldPickHUD = _shouldPickHUDOperator();
     // FIXME: give each type its own expiry
     // Each type will update at least one pick, regardless of the expiry
-    _updatedPickCounts[PickQuery::Stylus] = _stylusPickCacheOptimizer.update(cachedPicks[PickQuery::Stylus], _nextPickToUpdate[PickQuery::Stylus], expiry, false);
-    _updatedPickCounts[PickQuery::Ray] = _rayPickCacheOptimizer.update(cachedPicks[PickQuery::Ray], _nextPickToUpdate[PickQuery::Ray], expiry, shouldPickHUD);
-    _updatedPickCounts[PickQuery::Parabola] = _parabolaPickCacheOptimizer.update(cachedPicks[PickQuery::Parabola], _nextPickToUpdate[PickQuery::Parabola], expiry, shouldPickHUD);
-    _updatedPickCounts[PickQuery::Collision] = _collisionPickCacheOptimizer.update(cachedPicks[PickQuery::Collision], _nextPickToUpdate[PickQuery::Collision], expiry, false);
+    {
+        PROFILE_RANGE(picks, "StylusPicks");
+        PerformanceTimer perfTimer("StylusPicks");
+        _updatedPickCounts[PickQuery::Stylus] = _stylusPickCacheOptimizer.update(cachedPicks[PickQuery::Stylus], _nextPickToUpdate[PickQuery::Stylus], expiry, false);
+    }
+    {
+        PROFILE_RANGE(picks, "RayPicks");
+        PerformanceTimer perfTimer("RayPicks");
+        _updatedPickCounts[PickQuery::Ray] = _rayPickCacheOptimizer.update(cachedPicks[PickQuery::Ray], _nextPickToUpdate[PickQuery::Ray], expiry, shouldPickHUD);
+    }
+    {
+        PROFILE_RANGE(picks, "ParabolaPick");
+        PerformanceTimer perfTimer("ParabolaPick");
+        _updatedPickCounts[PickQuery::Parabola] = _parabolaPickCacheOptimizer.update(cachedPicks[PickQuery::Parabola], _nextPickToUpdate[PickQuery::Parabola], expiry, shouldPickHUD);
+    }
+    {
+        PROFILE_RANGE(picks, "CollisoinPicks");
+        PerformanceTimer perfTimer("CollisionPicks");
+        _updatedPickCounts[PickQuery::Collision] = _collisionPickCacheOptimizer.update(cachedPicks[PickQuery::Collision], _nextPickToUpdate[PickQuery::Collision], expiry, false);
+    }
 }
 
 bool PickManager::isLeftHand(unsigned int uid) {
diff --git a/libraries/shared/src/Profile.cpp b/libraries/shared/src/Profile.cpp
index 778b39aca5..272538e26d 100644
--- a/libraries/shared/src/Profile.cpp
+++ b/libraries/shared/src/Profile.cpp
@@ -12,6 +12,7 @@ Q_LOGGING_CATEGORY(trace_app, "trace.app")
 Q_LOGGING_CATEGORY(trace_app_detail, "trace.app.detail")
 Q_LOGGING_CATEGORY(trace_metadata, "trace.metadata")
 Q_LOGGING_CATEGORY(trace_network, "trace.network")
+Q_LOGGING_CATEGORY(trace_picks, "trace.picks")
 Q_LOGGING_CATEGORY(trace_parse, "trace.parse")
 Q_LOGGING_CATEGORY(trace_render, "trace.render")
 Q_LOGGING_CATEGORY(trace_render_detail, "trace.render.detail")
diff --git a/libraries/shared/src/Profile.h b/libraries/shared/src/Profile.h
index 01d86f8f2e..dc2ed6e754 100644
--- a/libraries/shared/src/Profile.h
+++ b/libraries/shared/src/Profile.h
@@ -18,6 +18,7 @@ Q_DECLARE_LOGGING_CATEGORY(trace_app)
 Q_DECLARE_LOGGING_CATEGORY(trace_app_detail)
 Q_DECLARE_LOGGING_CATEGORY(trace_metadata)
 Q_DECLARE_LOGGING_CATEGORY(trace_network)
+Q_DECLARE_LOGGING_CATEGORY(trace_picks)
 Q_DECLARE_LOGGING_CATEGORY(trace_render)
 Q_DECLARE_LOGGING_CATEGORY(trace_render_detail)
 Q_DECLARE_LOGGING_CATEGORY(trace_render_gpu)
diff --git a/scripts/system/controllers/+android_questInterface/controllerScripts.js b/scripts/system/controllers/+android_questInterface/controllerScripts.js
new file mode 100644
index 0000000000..d313efaca1
--- /dev/null
+++ b/scripts/system/controllers/+android_questInterface/controllerScripts.js
@@ -0,0 +1,58 @@
+"use strict";
+
+//  controllerScripts.js
+//
+//  Created by David Rowe on 15 Mar 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global Script, Menu */
+
+var CONTOLLER_SCRIPTS = [
+    "squeezeHands.js",
+    "controllerDisplayManager.js",
+    "toggleAdvancedMovementForHandControllers.js",
+    "controllerDispatcher.js",
+    "controllerModules/nearParentGrabOverlay.js",
+    "controllerModules/stylusInput.js",
+    "controllerModules/equipEntity.js",
+    "controllerModules/nearTrigger.js",
+    "controllerModules/webSurfaceLaserInput.js",
+    "controllerModules/inVREditMode.js",
+    "controllerModules/disableOtherModule.js",
+    "controllerModules/farTrigger.js",
+    "controllerModules/teleport.js",
+    "controllerModules/hudOverlayPointer.js",
+    "controllerModules/scaleEntity.js",
+    "controllerModules/nearGrabHyperLinkEntity.js",
+    "controllerModules/nearTabletHighlight.js",
+    "controllerModules/nearGrabEntity.js",
+    "controllerModules/farGrabEntity.js"
+];
+
+var DEBUG_MENU_ITEM = "Debug defaultScripts.js";
+
+function runDefaultsTogether() {
+    for (var j in CONTOLLER_SCRIPTS) {
+        if (CONTOLLER_SCRIPTS.hasOwnProperty(j)) {
+            Script.include(CONTOLLER_SCRIPTS[j]);
+        }
+    }
+}
+
+function runDefaultsSeparately() {
+    for (var i in CONTOLLER_SCRIPTS) {
+        if (CONTOLLER_SCRIPTS.hasOwnProperty(i)) {
+            Script.load(CONTOLLER_SCRIPTS[i]);
+        }
+    }
+}
+
+if (Menu.isOptionChecked(DEBUG_MENU_ITEM)) {
+    runDefaultsSeparately();
+} else {
+    runDefaultsTogether();
+}
diff --git a/scripts/system/controllers/controllerDispatcher.js b/scripts/system/controllers/controllerDispatcher.js
index 2a5cf5a727..28c3e2a299 100644
--- a/scripts/system/controllers/controllerDispatcher.js
+++ b/scripts/system/controllers/controllerDispatcher.js
@@ -497,6 +497,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
             distanceScaleEnd: true,
             hand: RIGHT_HAND
         });
+
         this.mouseRayPick = Pointers.createPointer(PickType.Ray, {
             joint: "Mouse",
             filter: Picks.PICK_OVERLAYS | Picks.PICK_ENTITIES | Picks.PICK_INCLUDE_NONCOLLIDABLE,