Merge "Fix a few layout issues for phone UI"