Merge "Increase deqp inactivity timeout to 10 mins" into mnc-dev