Merge "atrace: only start trace when starting trace" into pi-dev