Merge "Send app transition starting event at right time" into oc-dr1-dev