Merge commit '7bae17c6de08a1a6416f7d0e8da8b31c0c31ff9b' * commit '7bae17c6de08a1a6416f7d0e8da8b31c0c31ff9b': Fix Activity.overridePendingTransition().
Merge commit '7bae17c6de08a1a6416f7d0e8da8b31c0c31ff9b' * commit '7bae17c6de08a1a6416f7d0e8da8b31c0c31ff9b': Fix Activity.overridePendingTransition().