am efdb3946: am 1f7f0d83: am 8e77a43a: am 8aba65bb: am ed3791e1: am 92df3435: Merge "Increase VirtualDisplay test timeout to 40s" into lmp-sprout-dev

* commit 'efdb39468ab263a747961cc692132104f1be1fdd':