Merge "Enable email settings for ApiBlockTest::testBlockWithEmailBlock"