Merge "Increase VirtualDisplay test timeout to 40s" into lmp-sprout-dev