Merge "Fix ActivityEmbedding flicker when dragging freeform window"