Merge "Protecting TvExtender from being stripped by lightenPayload()"