Fix merge conflicts

src/components/nowplayingbar/nowplayingbar.js

@@ -237,8 +237,9 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         };
 
         elem.addEventListener('click', function (e) {
+
             if (!dom.parentWithTag(e.target, ['BUTTON', 'INPUT'])) {
-                showRemoteControl(0);
+                showRemoteControl();
             }
         });
     }