Merge "Improve Hybird hotseat cache support" into ub-launcher3-rvc-dev am: 870ec6a974

Change-Id: If1becdf551d4dc6c7c09fbec1ce158c90713da2d