Moved logic from SpinnerMatcher in to ViewMatcher