Fix basic catalyst viewer with theta

Change-Id: I7b8d7d31feae40407fd4b8e3cf7054e0eff3628e
Merge topic 'catalyst-web-fix' into master

87af8da1 Fix basic catalyst viewer with theta