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

am skip reason: subject contains skip directive

Change-Id: I00a0cab8cbf9e58d4d8fd86bc37232c69e813254