Merge "Fix circle in the opa ring and enlarge circle when opa is disabled (1/2)"