Merge "With content detection off, prefer default frame rate" into rvc-dev am: 98b789db15

Change-Id: I395de70daf2f3902fe378ae99a31f908bbd364df