Merge "Add anrd trace to bugreport" into cw-f-dev