Merge "Add null check on ActivityOptions before using it" into sc-v2-dev