Merge "fs_mgr_overlayfs: Trim surrounding "@" from the per mountpoint scratch dir name" into main