am 8c604349: Merge "Fix for a Launcher crash."

* commit '8c604349c7fabfe45f7f1474e4475646c1b9d195':
  Fix for a Launcher crash.