Merge "Add 'Restore' button to AppInfo screen" into main