Merge "Disable firmware roaming in idle mode" into main