Merge "MessageCache: Fix isMainCacheable() logic for non-content languages"