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

Change-Id: I14db68a1dda34e27b6bd594904a34bf295dd9f75