keep the shelf when we fall back to RoW feed (bug 1068917)
Merge pull request #2568 from ngokevin/feedshelfkeep

keep the shelf when we fall back to RoW feed (bug 1068917)