Fix filtering for screenshotting custom displays. am: 5a6d857f33 am: 8e4bf9f416 am: b88f7a5162

Change-Id: I13af722e510263dc5f6f8542ddab4d0b1e9042f9