Border incidents with China to continue till boundary dispute is resolved: Army Chief