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

Change-Id: I646d15c3d3ba3d6f1e7c8bdf2768860cf817b7df