Merge "Allow more than one temp view to be registered at a time" into pi-dev am: 501889c7d1
am: ecaf49e161

Change-Id: I3e8fa2b72c0c22d8e4dcc81003b1e2148f6bb932