Merge "Turn USE_SOONG_UI on by default"