Merge "Fix SafeActivityOptions construction in startActivityFromRecents" into pi-dev