Merge "Move BackgroundActivityStartMode to ActivityOptions" into main