Merge "Disable roaming sanity checking." into pi-dev