Merge "Merge "storagemenager: Skip fstrim while doing block based checkpoint" into qt-dev am: 274b17c9 am: 87bfbd60"