Merge "Fix remapRafIfApplicable get NPE" into main