Merge "Don't require root controllers to have associated views"