Merge "Require hold-to-drag for App Handle drags" into main