Merge "Pull roaming from mServiceState for consistency" into lmp-dev