Merge "Add more details to onTopActivityChanged error logs" into main