am 187f9665: Merge "Fixing backup restore" into ub-launcher3-burnaby

* commit '187f9665f69745518ebc65327bd662cab3f90cb8':
  Fixing backup restore