Merge "Intent.java EXTRA_USER clarifications"