Multi View Fix

Change-Id: I030bd64ae1d5191c0ede25ab78b80f9afbcc36b6
Revert "Multi View Fix"

This reverts commit 8069a05a516105cdff12851fb7dcc5d535d960ea.