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

* commit 'f5259a201dae2e25dffabbece3f66d931a7d8dd7':
  Fix VirtualDisplayTest by putting image checking task to an non-UI thread