Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT"