Merge "No-op when a transition happening on other display finished" into main