Merge "GATT Server refactoring (1/4)"