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

Change-Id: Icad4e7064db16d0f77bdffe4f9dad2af72c4a705