am: 8453136b * commit '8453136b': Fix Activity Transition mess-up. Change-Id: I3904d1d8782c07f0a869243802c1e1dc8d6e49b1