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

Change-Id: I2b759dbcc3f010172c843e84835ccb68182b5efd