Merge "Modify ActivityOptionsCompat"