This FC on tablets - To investigate later

(cherry picked from commit 542323d2573d8ddad8103d5d0abb37d44f9f184c)