Merge "Don't report displays that are going to be removed" into oc-dev am: 5a270bcd66
am: d6d0dcd4ce

Change-Id: I38e77e306ffc673b7285fdd8b1b94cafcea9fd6d