Merge "Add Development option for vendor logging in Settings app"