Merge "Revert "Allow Views to specify a theme override""