Merge "Also run flicker tests on cloud"