Merge "Only verify resolved theme attributes"