Merge "Clean up Settings_srcs & Settings_manifest"