Merge "Allow registered call notifications to always appear" into tm-dev