LPS-40616 Adding support for tablet as well