Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev