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

Change-Id: Ia9eac8a1aaa845ff2dd35f478e74f1ea80d0893b