Merge "Add trace logs in Launcher for perfetto to investigate two line issue" into main