Merge "Ignore failure when un/registering listener for invalid display" into rvc-dev am: 136c142894 am: 1136f05716 am: 1ff36d608b am: 330cf1eb86
Change-Id: I674f12c7bbe7111be613f0734c32b105659edc54
This commit is contained in: