Merge "Temporarily add a null intent check." into main