Merge "Fix notifications accepting touches outside their bounds" into tm-dev