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

Change-Id: I66022d62e01191ff48e22145ca6b1a71a465adb7