Merge "Add more logs to investigate empty launcher restore" into main