Merge "Enable SignalThreshold with consideration of both system and apps"