Merge "Use isTablet instead of isPhone for check" into tm-dev