Merge "registration: Fix regression in ExtensionMessagesFiles handling"