Merge "CEC: Skip routing control/internal source selection conditionally" into lmp-dev