Merge "Don't hardcode the size of app icon in MediaAppSelectorWidget" into pi-car-dev am: 9187cdfbec am: 188960fa14 am: e8a91fe8d3 am: 00dcf767a8
am: 4682e40719

Change-Id: Ica0bf6f37792682c129bff31e368cb69461abd3f