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