Merge changes Ia2f99fa3,I4320b04d

* changes:
  Replace old app transition type to new transition type (3/N)
  Replace old app transition type to new transition type (2/N)