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

Change-Id: Ic282f8d9ac2585199963a0052f5709a59c4882ff