Merge "[Memory Leak] Fix leak of TouchInteractionService from DisplayInfoChangeListener" into main