WPBQA-393: changes for tablets.