Merge "Set title for privacy dialog" into tm-dev