Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev am: 6255311d39 am: e18fd339be

Change-Id: Ie34ba15b709417dfad6cf071a313b23a42bbff2e