Merge "Hold intern table lock for AddImageStringsToTable"