Merge "Adds test to verify cached shortcuts don't count against the limit" into rvc-dev