Merge "Fix renderengine_test to work with new async drawLayers API"