diff --git a/quickstep/src/com/android/quickstep/NavBarSwipeInteractionHandler.java b/quickstep/src/com/android/quickstep/NavBarSwipeInteractionHandler.java
index 0810579..1a8ae2a 100644
--- a/quickstep/src/com/android/quickstep/NavBarSwipeInteractionHandler.java
+++ b/quickstep/src/com/android/quickstep/NavBarSwipeInteractionHandler.java
@@ -99,9 +99,9 @@
     private float mCurrentShift;
 
     // These are updated on the binder thread, and eventually picked up on doFrame
-    private float mCurrentDisplacement;
-    private boolean mTouchEnded = false;
-    private float mEndVelocity;
+    private volatile float mCurrentDisplacement;
+    private volatile float mEndVelocity;
+    private volatile boolean mTouchEnded = false;
 
     NavBarSwipeInteractionHandler(Bitmap taskSnapShot, RunningTaskInfo runningTaskInfo) {
         mTaskSnapshot = taskSnapShot;
@@ -154,6 +154,12 @@
         mLauncher.getStateManager().goToState(LauncherState.OVERVIEW, alreadyOnHome);
     }
 
+    /**
+     * This is updated on the binder thread and is picked up on the UI thread during the next
+     * scheduled frame.
+     * TODO: Instead of continuously scheduling frames, post the motion events to UI thread
+     * (can ignore all continuous move events until the last move).
+     */
     @BinderThread
     public void updateDisplacement(float displacement) {
         mCurrentDisplacement = displacement;
@@ -161,8 +167,8 @@
 
     @BinderThread
     public void endTouch(float endVelocity) {
-        mTouchEnded = true;
         mEndVelocity = endVelocity;
+        mTouchEnded = true;
     }
 
     @UiThread
diff --git a/res/xml/device_profiles.xml b/res/xml/device_profiles.xml
index c582fc5..30c1c54 100644
--- a/res/xml/device_profiles.xml
+++ b/res/xml/device_profiles.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<profiles xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" >
+<profiles xmlns:launcher="http://schemas.android.com/apk/res-auto" >
 
     <profile
         launcher:name="Super Short Stubby"