Merge "fs_mgr: overlay check shared blocks for / if /system is not"