Merge "Add default frame rate setting" into rvc-dev am: 3d6a1cfb1b am: b2ccfaf93f

Change-Id: I9b40bbe3aec6933149b9d3e204fa116d9620db32