Merge "Enable ShadeViewDiffer systrace logs" into udc-dev