Merge "Restrict app transition maximum duration" into rvc-dev am: f43e6bc4 am: a14a3d3d am: 3058d24f Change-Id: I78e4086489919d5ca36a966b360a14c40d519104