Merge "Print UI polish based on UX feedback."