Merge "Bluetooth 5 advertising duration refactoring (2/4)"