Merge "Unregister display listener"