Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev