Merge "Roaming blacklist" into lmp-dev