Merge "Enable shortcut view for only specific countries."
am: a6bf21f9e7

Change-Id: Ic192b37c7b7ffef1f583b06c17d144f7a6ae5f1a