am 9ecd07d6: Merge "More Launcher performance improvements." into froyo