Bugfixes for v1.29

* If focus was set to document.body during archive, focus left pane
* Shortcut Guide: Add space between text and shortcut highlight
* Ensure that draft attachment can be closed with click on X button
* Move to keyDown event for user idle checking
* Additional resiliency around avatars; check for them on on-disk
* Increase timeouts to preserve websocket connection
* On startup, be resilient to malformed JSON in log files
* Don't crash if shell.openExternal returns an error
* Whenever we request a contact/group sync, also request block list
* Avatar popup: Ensure styling is mouse- and keyboard-appropriate
* MainHeader: Create popperRoot on demand, not on mount
* CompositionInput: Disable default Ctrl-/ shortcut
* Update libphonenumber

ts/components/conversation/Image.tsx

@@ -162,20 +162,6 @@ export class Image extends React.Component<Props> {
             alt={i18n('imageCaptionIconAlt')}
           />
         ) : null}
-        {closeButton ? (
-          <button
-            onClick={(e: React.MouseEvent<{}>) => {
-              e.preventDefault();
-              e.stopPropagation();
-
-              if (onClickClose) {
-                onClickClose(attachment);
-              }
-            }}
-            className="module-image__close-button"
-            title={i18n('remove-attachment')}
-          />
-        ) : null}
         {bottomOverlay ? (
           <div
             className={classNames(
@@ -199,6 +185,20 @@ export class Image extends React.Component<Props> {
           </div>
         ) : null}
         {overlay}
+        {closeButton ? (
+          <button
+            onClick={(e: React.MouseEvent<{}>) => {
+              e.preventDefault();
+              e.stopPropagation();
+
+              if (onClickClose) {
+                onClickClose(attachment);
+              }
+            }}
+            className="module-image__close-button"
+            title={i18n('remove-attachment')}
+          />
+        ) : null}
       </div>
     );
   }