Merge "Add icon logic for 5G SA mode" into rvc-qpr-dev