Fix other tests interfering EntityViewTest

This is a nasty quick fix to work around sporadic test failures.
The real solution is to isolate EntityView from, global state,
see I760ef1eb6 and I430dc1f2b.

Change-Id: Id264fa056805ff32bb8aa7aa3fc54974a0809e92
Merge "Fix other tests interfering EntityViewTest"