Merge changes I3506c8e7,I198c0e8c,I8a5d4e36

* changes:
  fs_mgr: remount: automatically disable verity
  fs_mgr: remount: pull root device from fstab
  fs_mgr: test: track device active slot throughout