Merge "Improve Hybird hotseat cache support" into ub-launcher3-rvc-dev