Merge "Send app transition starting event at right time" into oc-dr1-dev
am: 790e3ff6e3

Change-Id: Iadada99fc926de016dc78b1a82270ceda5039066