Merge "Support waiting for surfaceflinger service to stop before test starts"