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

Change-Id: I5fae06627aefb39a6904a9ef1c3608f766b8e661