Merge "Allow specification of View theme override as a theme attribute"