Merge "storagemenager: Skip fstrim while doing block based checkpoint" into qt-dev