Merge "Restrict app transition maximum duration" into rvc-dev am: f43e6bc4 am: a14a3d3d am: 59eca6d2 Change-Id: I679a20d6d21f10309b2e02e2680585bf02b93d56