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

Change-Id: I459aab69eff87ca7a4b3039977332f50e82e0480