Fix filtering for screenshotting custom displays. am: 5a6d857f33 am: f537ef6c8f am: 0f9e7d5e15

Change-Id: Iab28749cabc0bd44e1eccbe5cffb6cefb8bc2331