Merge "Allows a plugin Settings activity to designate plugins it supports." into sc-dev