Merge "InputManagerService: Do not remove input channel when disposing monitor" into sc-dev