Merge "Dispose per-display input channel explicilty when removing display"