Merge "Unregister display listener"
am: 0f9a644645

Change-Id: Id9b722f59699566aa5690bf114f3f6d7d138fb52