Merge "Make telephony actions unconditionally protected" into tm-dev