Update patch from boeffla 5.4 beta4 for SGS3