Merge "Fix app transition logging when switching quickly" into oc-dev am: 4cbad7fac1
am: 86c8ba41f3

Change-Id: I6c0355c4d90e127e809620d857ce138a077c6840