Fixes https://github.com/WhisperSystems/Signal-Android/issues/5751 Fixes https://github.com/WhisperSystems/Signal-Android/issues/6218 // FREEBIE Upstream commit: https://github.com/WhisperSystems/Signal-Android/commit/2f46c6ca1fba65596c08bfcab24a2e47df163ef5