Merge "Allow Views to specify a theme override"