Merge "Adding tracing for app-to-overview"