Merge "Restrict app transition maximum duration" into rvc-dev