Merge "[Fix NPE]: Add a null check" into main