Merge "Allow intent into Privacy Controls page" into tm-dev