Merge "Restrict app transition maximum duration" into rvc-dev am: f43e6bc4 am: bdcd29b5 am: 4647156a Change-Id: I8e94ce7073a326a953e622c53495ab2b0d81d3e7