[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into qt-dev am: b60d52fd70 am: e4c1da0634 -s ours am: 9faf53e42a am: f9ad3a7e4d

Change-Id: I9ac9faa213910c171a2afa261d8668b372375904