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

Change-Id: I2789caaf1889ac524369a0cbf0de6d5533d2b30c