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

Change-Id: Ie5d91b1ece540f09cea7c59528769230ae349572