Merge "Task UI: Add status icons" into stable-2.16