Merge "MAP: Remove handling for ACTION_MESSAGE_DELIVERY"