Merge "Remove user TIS unlocked runnable when a TIS instance is destroyed" into main