Merge "Don't preserve the window on client side when pinning activity."