Merge "Turn off the display while running dexopt test" into tm-dev