Merge "Fix margins and positioning for the small (implicit) face view." into udc-dev