Merge "Add layer filter to winscope" into rvc-dev am: e871962f81

Change-Id: I6fbd5c8e4e817d2257df0b8a8e05084d8132a0b6