Fixes https://github.com/WhisperSystems/Signal-Android/issues/5941 Closes https://github.com/WhisperSystems/Signal-Android/pull/6152 // FREEBIE Upstream commit: https://github.com/signalapp/Signal-Android/commit/83e31cac074ff7945128af2ccdebc9c2d3cbeae1