Merge "fs_mgr_overlayfs: Setup remount scratch dir with encoded mountpoint name" into main