Merge "Merge "Increase max shortcut limit to 10" into qt-dev am: 1a31c77eea" into qt-dev-plus-aosp
am: 3be599c46b

Change-Id: I73258b866a72489ba1b234b512b998e899e5b187