Merge "Trace currently resumed app" into pi-dev