Merge "fs_mgr_overlayfs: MapScratchPartitionIfNeeded always tries to create scratch" into main