Merge "Set options on startingActivity instead of topActivity" into pi-dev