Merge "Increases the shortcut limit to 15 per activity" into rvc-dev