Fixes #206: ClientCanvas broken with RAP 2.2

Change-Id: I3ff5e3d9ccc656a5ae78556f88d1e964188a72a2