Merge "fs_mgr: overlayfs skip mount points that are more specific"