Merge "When waiting for activity to finish don't reset" into klp-dev