Merge "Revert "Pass ActivityOptions to HeavyWeightSwitcherAcivity."" into sc-dev