Merge "Remove duplicate isTablet initialization"