Merge "Revert "Update launcher preview icons on themed icon update"" into main