Merge "Fix advanced icon will incorrect on some device" into rvc-dev