Merge "Moving ProportionalLayout to ContactsCommon."