Merge changes Iaadc7e1a,I3e8d5d2f into main

* changes:
  Add flag for restoring Archived App Icons from db
  Add flag for restoring archived pinned shortcuts