Merge "sdm: Fix the deadlock in DeferFpsConfig feature use case"