Merge "Notify VDM for display removal before listeners." into main