Merge "Eleven: fix default image not showing up in queue fragment" into cm-12.0

res/layout/list_item_queue.xml

@@ -21,7 +21,7 @@
     android:paddingTop="@dimen/list_item_padding_top"
     android:paddingBottom="@dimen/list_item_padding_bottom">
 
-    <com.cyanogenmod.eleven.widgets.SquareImageView
+    <ImageView
         android:id="@+id/image"
         android:layout_width="@dimen/list_item_image_width"
         android:layout_height="@dimen/list_item_image_height"