Merge "Fix the layout issue for smaller screens."