Merge "Renames EXTRA_REMOVED_BY_SYSTEM to EXTRA_USER_INITIATED"