Merge "Ignore failure when un/registering listener for invalid display" into rvc-dev am: 136c142894

Change-Id: Ida7b3b26839c070391d371f95487d6941e1c09b6