Merge "[Settings] Enable support on testing"