Merge "Fix schema migration that creates index for submodule subscriptions"