Merge "Revert "Cleanup drop input for AE during legacy transition"" into main