Merge "Add system property for hot startup method threshold"