Merge "Increase resolved classes save delay to 5s"