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