Merge "Revert "Letting View handle click and longclick detection"" into main