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

Change-Id: I1521d0fb62cd59948a94988197c0c8a0394fa35f