Merge release/2.37 into trunk

[wpmobilebot]

Merging release/2.37 into trunk.

Via intermediate branch merge/release-2.37-into-trunk, to help fix conflicts if any:

                            release/2.37  ----o-- - - -
                                               \
           merge/release-2.37-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

[dangermattic]

	1 Message
📖	This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

[mzorz]

LGTM

[wpmobilebot]

📲 You can test the changes from this Pull Request in Simplenote Android by scanning the QR code below to install the corresponding build.

	App Name	Simplenote Android
	Build Type	Debug
	Commit	dd58b0f
	Direct Download	simplenote-android-prototype-build-pr1782-dd58b0f-0199f6cf-3e79-4c68-a717-396c146b6273.apk