Merge "Increase FUSE entry timeout for /sdcard and /sdcard/Android"