Fixed issues with overlay comparative view.

Representations seemed to stay around when switching back and forth between
overlay and grid.

Change-Id: I3fb8c98c86be6e2fb830fb5380fd88341ec8a6d8
Merge topic '13799_comparative_view_fixes' into next

8dac475 Fixed issues with overlay comparative view.