Merge "Widget types for unselectable and custom views"