Merge "Fix tuner filter delay API"