Merge "SystemSettings_AboutDevice_fix_RB" into main