Merge "Prevent crashes on null intent in Slice Builder" into pi-dev