diff --git a/dashboard-ui/bower_components/doc-ready/.bower.json b/dashboard-ui/bower_components/doc-ready/.bower.json
index d4d75eca65..adda4287b4 100644
--- a/dashboard-ui/bower_components/doc-ready/.bower.json
+++ b/dashboard-ui/bower_components/doc-ready/.bower.json
@@ -39,6 +39,6 @@
     "commit": "cec8e49744a1e18b14a711eea77e201bb70de544"
   },
   "_source": "git://github.com/desandro/doc-ready.git",
-  "_target": "~1.0.4",
+  "_target": "1.0.x",
   "_originalSource": "doc-ready"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/get-style-property/.bower.json b/dashboard-ui/bower_components/get-style-property/.bower.json
index d943fa3b04..973f1966c0 100644
--- a/dashboard-ui/bower_components/get-style-property/.bower.json
+++ b/dashboard-ui/bower_components/get-style-property/.bower.json
@@ -31,6 +31,6 @@
     "commit": "34fc5e4a0f252964ed2790138b8d7d30d04b55c1"
   },
   "_source": "git://github.com/desandro/get-style-property.git",
-  "_target": "~1.0.4",
+  "_target": "1.x",
   "_originalSource": "get-style-property"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json
index ebb18c5b7b..52d44c1907 100644
--- a/dashboard-ui/bower_components/iron-selector/.bower.json
+++ b/dashboard-ui/bower_components/iron-selector/.bower.json
@@ -36,7 +36,7 @@
     "tag": "v1.0.8",
     "commit": "e9a66727f3da0446f04956d4e4f1dcd51cdec2ff"
   },
-  "_source": "git://github.com/polymerelements/iron-selector.git",
+  "_source": "git://github.com/PolymerElements/iron-selector.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-selector"
+  "_originalSource": "PolymerElements/iron-selector"
 }
\ No newline at end of file
diff --git a/dashboard-ui/cordova/android/iap.js b/dashboard-ui/cordova/android/iap.js
index 6993947592..9d205a8fc0 100644
--- a/dashboard-ui/cordova/android/iap.js
+++ b/dashboard-ui/cordova/android/iap.js
@@ -110,40 +110,37 @@
 
     function isUnlockedOverride(feature) {
 
-        var deferred = DeferredBuilder.Deferred();
-
         if (feature == 'playback' || feature == 'livetv') {
-            isPlaybackUnlockedViaOldApp(deferred);
+            return isPlaybackUnlockedViaOldApp();
         } else {
-            deferred.resolveWith(null, [false]);
-        }
+            return new Promise(function (resolve, reject) {
 
-        return deferred.promise();
+                resolve(false);
+            });
+        }
     }
 
-    function isPlaybackUnlockedViaOldApp(deferred) {
+    function isPlaybackUnlockedViaOldApp() {
 
-        testDeviceId(ConnectionManager.deviceId()).then(function (isUnlocked) {
+        return testDeviceId(ConnectionManager.deviceId()).then(function (isUnlocked) {
 
             if (isUnlocked) {
-                deferred.resolveWith(null, [true]);
-                return;
+                return true;
             }
 
-            var legacyDeviceId = NativeIapManager.getLegacyDeviceId();
-            if (legacyDeviceId) {
-                testDeviceId(legacyDeviceId).then(function(isUnlocked) {
+            return testDeviceId(device.uuid).then(function (isUnlocked) {
 
-                    if (isUnlocked) {
-                        deferred.resolveWith(null, [true]);
-                        return;
-                    }
+                if (isUnlocked) {
+                    return true;
+                }
 
-                    deferred.resolveWith(null, [false]);
-                });
-            } else {
-                deferred.resolveWith(null, [false]);
-            }
+                var legacyDeviceId = MainActivity.getLegacyDeviceId();
+                if (legacyDeviceId) {
+                    return testDeviceId(legacyDeviceId);
+                }
+
+                return false;
+            });
         });
     }
 
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index b8e9cf9c7b..b4c3888571 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -660,8 +660,8 @@ div[data-role="controlgroup"] a.ui-btn-active {
 }
 
 .paperLibraryViewNav.headroom--unpinned:not(.headroomDisabled) {
-    -webkit-transform: translateY(-205%);
-    transform: translateY(-205%);
+    -webkit-transform: translateY(-240%);
+    transform: translateY(-240%);
 }
 
 .checkboxContainer {
diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js
index 1fc875ee5c..5c3104252e 100644
--- a/dashboard-ui/scripts/search.js
+++ b/dashboard-ui/scripts/search.js
@@ -158,7 +158,6 @@
         return elem;
     }
 
-    var currentAnimation;
     var isVisible;
 
     function onHeaderSearchChange(val) {
@@ -199,7 +198,7 @@
           { opacity: '0', offset: 0 },
           { opacity: '1', offset: 1 }];
         var timing = { duration: 200, iterations: iterations, fill: 'both' };
-        currentAnimation = elem.animate(keyframes, timing);
+        elem.animate(keyframes, timing);
     }
 
     function fadeOut(elem, iterations) {
@@ -207,7 +206,9 @@
           { opacity: '1', offset: 0 },
           { opacity: '0', offset: 1 }];
         var timing = { duration: 600, iterations: iterations, fill: 'both' };
-        currentAnimation = elem.animate(keyframes, timing);
+        elem.animate(keyframes, timing).onfinish = function () {
+            elem.parentNode.removeChild(elem);
+        };
     }
 
     function bindSearchEvents() {
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index e21820c80e..6f1b88ff5b 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2219,8 +2219,11 @@ var AppInfo = {};
                     // Remove special characters
                     var cleanDeviceName = device.model.replace(/[^\w\s]/gi, '');
 
+                    var deviceId = window.MainActivity ? MainActivity.getLegacyDeviceId() : null;
+                    deviceId = deviceId || device.uuid;
+
                     resolve({
-                        deviceId: device.uuid,
+                        deviceId: deviceId,
                         deviceName: cleanDeviceName,
                         appName: name,
                         appVersion: appVersion
@@ -2277,7 +2280,7 @@ var AppInfo = {};
             if (deviceId) {
                 onDeviceAdAcquired(deviceId);
             } else {
-                require(['cryptojs-md5'], function () {
+                require(['cryptojs-sha1'], function () {
                     var keys = [];
                     keys.push(navigator.userAgent);
                     keys.push((navigator.cpuClass || ""));