Merge "4G+ RAT icon can not be displayed when back to 4G from 4G+" into rvc-dev