Merge "Avoid deadlock when FSTRIM requested at boot."