Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev