Merge "Fix fastdeploy issues when testing Boat Attack Unity3D demo"