Merge "Fully migrate tv to notification permission" into tm-dev