Merge "Fix unbounded number of uncached shortcuts" into tm-qpr-dev