Merge "Fix app transition logging when switching quickly" into oc-dev