Merge "Fully strip META state during event rewrite"