Merge "CEC: Back up active input correctly against repeated active source commands"