Make the layout transition fix work for phones as well