Merge "Remove redundant theme resource"