Merge "BUG 2593 : Fix flakiness in ShardManager ActorNotInitialized tests"