Merge branch 'field-api-displays-1830868' of git.drupal.org:sandbox/yched/1736366 into field-api-displays-1830868