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

Change-Id: I7b206a8d50f6ba8f999bef1a5a3650a721929379