Merge "Fix VirtualDisplayTest by putting image checking task to an non-UI thread"