Merge "Move GONE transition listener to application scope" into main