Merge "Increase long timeout to 2 minutes" into lmp-dev