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

This reverts commit f05d69a3220addd0e865aced0839dd57b41d7681.