Merge "[Phone] Fix layout for phone favorite screen"