Merge "sdm: Add support to defer Fps config"