am 553a8f6f: Merge "Fixing crash in restore" into ub-launcher3-burnaby

* commit '553a8f6f44bbf0289f957815d6a0323a620147a8':
  Fixing crash in restore