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

Change-Id: I13fcb866c402c1b0ed8233582fc1d7a40d10c707