Merge "Add a no-op activity to handle development setting intent." into oc-dev