Merge "Increase max shortcut limit to 10" into qt-dev