Merge "Revert "Dismiss freeform tasks occluding keyguard in folded transitions"" into udc-qpr-dev