Merge "Enable second reboot for FUSE sys prop change to take effect"