Merge "Modify headline margins to UX spec" into udc-dev