Merge "Fix next row id backup for work profile and adoptable storage" into tm-dev