Merge "Do not tint task/nav bar icons in folded state when task bar on phones is enabled" into main