Merge "Switch FRP check to the new trustworthy source" into main