Merge "Change which states are considered active in InCallController" into sc-dev