Merge "Skip next row id backup for devices with adoptable storage" into tm-dev