Merge "Fix bug 3440372 - Spinner measurement issues with new rules"