Merge "Consider subId when loading Wfc string resources"