Merge "Potential fix for launcher lockup (5369863)" into ics-mr1