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

* commit 'e4410ec01379b938033f759f644bcbfcd58d4e25':
  Potential fix for launcher lockup (5369863)