Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1