Merge "Remove inset for non-freeform tasks when desktop mode is enabled" into main