Merge "Remove dead code around use_frame_rate_api"