Merge "Unregister display listener" into oc-mr1-dev