Merge "Make "Standby now" default behavior on losing active source" into tm-dev