Merge "Do not launch non exposed add printer activity" into nyc-dev