Merge "Fix startActivityFromRecents didn't apply options in time."