Merge "GATT Server refactoring (2/4)"