Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into qt-dev am: b60d52fd70

Change-Id: Iac10015bb45f9b21d5c0c2f1354c6d7e98265941