Merge "Add a setting to allow a user to choose the native image format"