Fixes an issue that caused the cancel button title to be shown briefly before the delete button title appears.
Merge branch 'refs/heads/feature/notFlickeringBottomButton' into dev