Merge "Use only current density to check isTablet" into sc-v2-dev