Merge "Disable the trustedOverlay flag for taskview" into main