Merge "More Launcher performance improvements." into froyo