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

Change-Id: I4fea50b67147229586bac52e9e4a79391f6f1b29