Merge "Remove references to SkMSec type" into main