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

Change-Id: Iedc6b33947cf85647a158d0423910dd50b6098cd