Merge "Do not set click listener for CellLayout during accessible drag, to prevent double tap to activate message." into main