Merge "Add 40fps as a FPS option" into tm-dev