Merge "Revert "Drop all caches in UI_HIDDEN""