Merge "Stop tracking the secure setting because we're in master"