Merge "Update the CPU text cache sizes to be the same as their GPU equivalents" into qt-dev