Merge "Support changing style parent in overlays"