Merge "fs_mgr: Refactor fs_mgr_overlayfs_already_mounted() to be more readable" into main