Merge "Allow more than one temp view to be registered at a time" into pi-dev