Merge "[Settings] Code reformat" into rvc-dev