Merge "Revert "Sets views clickable according to their visibility""