Revert "Revert "Phablet bug fix""

This reverts commit a435d04f64d0eb9a2301bceab6ef10150b0037aa.