Merge "Fix 9patches in Launcher" into honeycomb