diff --git a/dashboard-ui/cordova/registrationservices.js b/dashboard-ui/cordova/registrationservices.js
index 0b586642fe..3bc37f6009 100644
--- a/dashboard-ui/cordova/registrationservices.js
+++ b/dashboard-ui/cordova/registrationservices.js
@@ -2,9 +2,7 @@
 
     function isAndroid() {
 
-        var platform = (device.platform || '').toLowerCase();
-
-        return platform.indexOf('android') != -1;
+        return $.browser.android;
     }
 
     function getPremiumUnlockFeatureId() {
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index b97cdb0ca1..3305c4bc84 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -364,10 +364,6 @@
     display: none !important;
 }
 
-.libraryDocument .inboxSidebarLink {
-    display: none !important;
-}
-
 .dashboardDocument .lnkMySync {
     display: none !important;
 }
@@ -376,6 +372,10 @@
     display: none !important;
 }
 
+.dashboardDocument .headerVoiceButton {
+    display: none !important;
+}
+
 .darkDrawer {
     background-color: #282828 !important;
 }
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index 4f61267825..dce05e8d82 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -18,32 +18,23 @@
 
                 <form class="encodingSettingsForm">
 
-                    <fieldset data-role="controlgroup">
-                        <legend>${HeaderTranscodingQualityPreference}</legend>
-                        <input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioAuto" value="Auto">
-                        <label for="radioAuto">
-                            ${OptionAutomatic}<br />
-                            <span style="font-weight: normal;">${OptionAutomaticTranscodingHelp}</span>
-                        </label>
-                        <input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioHighSpeed" value="HighSpeed">
-                        <label for="radioHighSpeed">
-                            ${OptionHighSpeedTranscoding}<br />
-                            <span style="font-weight: normal;">${OptionHighSpeedTranscodingHelp}</span>
-                        </label>
-                        <input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioHighQuality" value="HighQuality">
-                        <label for="radioHighQuality">
-                            ${OptionHighQualityTranscoding}<br />
-                            <span style="font-weight: normal;">${OptionHighQualityTranscodingHelp}</span>
-                        </label>
-                        <input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioMaxQuality" value="MaxQuality">
-                        <label for="radioMaxQuality">
-                            ${OptionMaxQualityTranscoding}<br />
-                            <span style="font-weight: normal;">${OptionMaxQualityTranscodingHelp}</span>
-                        </label>
-                    </fieldset>
-
-                    <br />
                     <ul data-role="listview" class="ulForm">
+                        <li>
+                            <label for="selectThreadCount">${LabelTranscodingThreadCount}</label>
+                            <select id="selectThreadCount" data-mini="true">
+                                <option value="-1">${OptionAuto}</option>
+                                <option value="1">1</option>
+                                <option value="2">2</option>
+                                <option value="3">3</option>
+                                <option value="4">4</option>
+                                <option value="5">5</option>
+                                <option value="6">6</option>
+                                <option value="7">7</option>
+                                <option value="8">8</option>
+                                <option value="0">${OptionMax}</option>
+                            </select>
+                            <div class="fieldDescription">${LabelTranscodingThreadCountHelp}</div>
+                        </li>
                         <li>
                             <input type="checkbox" id="chkEnableThrottle" data-mini="true" />
                             <label for="chkEnableThrottle">${OptionEnableTranscodingThrottle}</label>
diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js
index 0070a15a8c..52a6eb1b0e 100644
--- a/dashboard-ui/scripts/encodingsettings.js
+++ b/dashboard-ui/scripts/encodingsettings.js
@@ -11,6 +11,7 @@
 
         }).checkboxradio('refresh');
 
+        $('#selectThreadCount', page).val(config.EncodingThreadCount).selectmenu('refresh');
         $('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost);
         $('#txtTranscodingTempPath', page).val(config.TranscodingTempPath || '');
 
@@ -29,6 +30,7 @@
             config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
             config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
             config.EnableThrottling = $('#chkEnableThrottle', form).checked();
+            config.EncodingThreadCount = $('#selectThreadCount', form).val();
 
             ApiClient.updateNamedConfiguration("encoding", config).done(Dashboard.processServerConfigurationUpdateResult);
         });
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 90cc3c17a8..c8e51ca0a4 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -333,12 +333,8 @@
         html += '</div>';
 
         html += '<div class="userMenuOptions">';
-        html += '<div class="sidebarDivider"></div>';
 
-        html += '<a class="sidebarLink lnkMediaFolder inboxSidebarLink" data-itemid="inbox" onclick="return LibraryMenu.onLinkClicked(event, this);" href="notificationlist.html"><iron-icon icon="inbox" class="sidebarLinkIcon"></iron-icon>';
-        html += Globalize.translate('ButtonInbox');
-        html += '<div class="btnNotifications"><div class="btnNotificationsInner">0</div></div>';
-        html += '</a>';
+        html += '<div class="sidebarDivider"></div>';
 
         if (user.localUser && showUserAtTop()) {
             html += '<a class="sidebarLink lnkMediaFolder lnkMySettings" onclick="return LibraryMenu.onLinkClicked(event, this);" data-itemid="mysync" href="mypreferencesmenu.html?userId=' + user.localUser.Id + '"><iron-icon icon="settings" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonSettings') + '</span></a>';
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 1606750cb7..67f87a12e4 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -972,8 +972,7 @@
         self.playVideoInternal = function (item, mediaSource, startPosition, streamInfo, callback) {
 
             var videoUrl = streamInfo.url;
-            var contentType = streamInfo.mimeType;
-            var startPositionInSeekParam = streamInfo.startPositionInSeekParam;
+
             self.startTimeTicksOffset = streamInfo.startTimeTicksOffset;
 
             var mediaStreams = mediaSource.MediaStreams || [];
@@ -1137,25 +1136,7 @@
 
             mediaRenderer.init().done(function () {
 
-                var textStreams = subtitleStreams.filter(function (s) {
-                    return s.DeliveryMethod == 'External';
-                });
-
-                var tracks = [];
-
-                for (var i = 0, length = textStreams.length; i < length; i++) {
-
-                    var textStream = textStreams[i];
-                    var textStreamUrl = !textStream.IsExternalUrl ? ApiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
-
-                    tracks.push({
-                        url: textStreamUrl,
-                        language: (textStream.Language || 'und'),
-                        isDefault: textStream.Index == mediaSource.DefaultSubtitleStreamIndex
-                    });
-                }
-
-                mediaRenderer.setCurrentSrc(videoUrl, item, mediaSource, tracks);
+                self.setSrcIntoRenderer(mediaRenderer, videoUrl, item, self.currentMediaSource);
 
                 if (callback) {
                     callback();
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 4f84397579..c3cbbf9550 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -640,7 +640,7 @@
                 ApiClient.stopActiveEncodings(playSessionId).done(function () {
 
                     //self.startTimeTicksOffset = newPositionTicks;
-                    mediaRenderer.setCurrentSrc(url, self.currentItem, self.currentMediaSource);
+                    self.setSrcIntoRenderer(mediaRenderer, url, self.currentItem, self.currentMediaSource);
 
                 });
 
@@ -648,10 +648,37 @@
                 self.updateTextStreamUrls(newPositionTicks || 0);
             } else {
                 self.startTimeTicksOffset = newPositionTicks || 0;
-                mediaRenderer.setCurrentSrc(url, self.currentItem, self.currentMediaSource);
+                self.setSrcIntoRenderer(mediaRenderer, url, self.currentItem, self.currentMediaSource);
             }
         }
 
+        self.setSrcIntoRenderer = function (mediaRenderer, url, item, mediaSource) {
+
+            var subtitleStreams = mediaSource.MediaStreams.filter(function (s) {
+                return s.Type == 'Subtitle';
+            });
+
+            var textStreams = subtitleStreams.filter(function (s) {
+                return s.DeliveryMethod == 'External';
+            });
+
+            var tracks = [];
+
+            for (var i = 0, length = textStreams.length; i < length; i++) {
+
+                var textStream = textStreams[i];
+                var textStreamUrl = !textStream.IsExternalUrl ? ApiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
+
+                tracks.push({
+                    url: textStreamUrl,
+                    language: (textStream.Language || 'und'),
+                    isDefault: textStream.Index == mediaSource.DefaultSubtitleStreamIndex
+                });
+            }
+
+            mediaRenderer.setCurrentSrc(url, item, mediaSource, tracks);
+        };
+
         self.setCurrentTime = function (ticks, positionSlider, currentTimeElement) {
 
             // Convert to ticks
diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json
index 4471a1a88f..c8c6c341c8 100644
--- a/dashboard-ui/strings/html/server.json
+++ b/dashboard-ui/strings/html/server.json
@@ -1512,6 +1512,9 @@
     "HeaderHomeScreenSettings": "Home Screen settings",
     "HeaderProfile": "Profile",
     "HeaderLanguage": "Language",
-    "ButtonSyncSettings":  "Sync settings",
-    "ButtonSyncSettingsHelp": "Configure your sync settings"
+    "ButtonSyncSettings": "Sync settings",
+    "ButtonSyncSettingsHelp": "Configure your sync settings",
+    "LabelTranscodingThreadCount": "Transcoding thread count:",
+    "LabelTranscodingThreadCountHelp": "Select the maximum number of threads to use when transcoding. Reducing the thread count will lower cpu usage but may not convert fast enough for a smooth playback experience.",
+    "OptionMax": "Max"
 }