Revert "Revert "Revert "Fix expanded on phone"""

This reverts commit 8462785e96812cf8078feeab0228eb0414adda9a.