Merge "Restore deleted string still referenced from layout."