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

Change-Id: I40858972bef2aee7adf1653f8169ffadaa578e90