Merge "Use adaptive icon in Settings" into rvc-dev