Revert "Revert "Merge pull request #12323 from nullaus/891724-supportcontactcustomization""

This reverts commit 2cdc245b30910ada71032a5cfc81922b548ba994.
fix tests.