Merge "Fix 5797764: fix crash on tablets"