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

Change-Id: I8977f8222fb6a23dbaeb5181bf9d62d12520f661