Revert "Set options on startingActivity instead of topActivity"

This reverts commit ee6f81b20286e5942ce738763e3b8713dfc7c9ac.

Bug: 74611027
3 files changed