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

Change-Id: I5c3befe3b81ab752f2337f934f61f6062f11a31d