Merge "Fix ThreadFeatureCheckerRule on U- devices" into main