Merge "Notify transition listener only for its interested display" into main