Merge "Fix app notification toggle" into tm-dev