Merge "Add missing isTablet assumptions to tests" into main