am b3db5b73: Merge "Fix issue #5309443: Ninjump crashes on boot with..."

* commit 'b3db5b73a6ce3771ae914f132ae72cdb4ddbaa20':
  Fix issue #5309443: Ninjump crashes on boot with...