Merge "Update activity alias for developer settings activity"