Merge "Add layer filter to winscope" into rvc-dev