Merge "Fix another issue with constructing SafeActivityOptions" into pi-dev