am 929fff0e: Potential fix for launcher lockup (5369863)

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