Merge "BUG-865: Remove SchemaServiceListener"