Merge "Define an order for the media source list" into pi-car-dev am: ed81f6fff0 am: d6a5e75e0d am: 6ca47f256c
am: c2fe251866

Change-Id: I2827c706831101f9e22c32f2253ceb847bda3814