Moved launchMode into activity
Indent and whitespace
newSettings is not used
Forgot to add res.srcDirs for basic flavor after c56e5ea4b8572f5e9552454cbadcde1214b0a11b
Indent