Revert "Revert "Revert "Phablet bug fix"""

This reverts commit 971fd28b15b2fe782517c276f7033120b4ad3b47.