Merge "Chaning LauncherActivityInfo to return a density specific non-badged icon" into nyc-dev