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