Merge "Improve AppCompatTaskInfo readability" into main