cherry pick commit that moves sample field into a view controller