Merge "fs_mgr_overlayfs: Don't try to mount scratch if already mounted" into main