Merge "Disable Broken Settings Tests"