Merge "Fix IndexOutOfBoundsException on VirtualDisplay removal"